]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
overviewControls: Always allocate the actor its full size
authorJasper St. Pierre <jstpierre@mecheye.net>
Wed, 18 Sep 2013 23:29:30 +0000 (19:29 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Wed, 30 Oct 2013 17:16:45 +0000 (13:16 -0400)
This is the new Clutter way -- if the actor wants to adjust its
alignment, it will do it itself with its alignment flags.

js/ui/overviewControls.js

index 7e1f6a258ef70438406d815c2794ed62e729343d..a1d99e68c7f5375ab20503394461a2fb6c7b9527 100644 (file)
@@ -67,7 +67,7 @@ const SlideLayout = new Lang.Class({
 
         let actorBox = new Clutter.ActorBox();
         actorBox.x1 = box.x1 + alignX;
-        actorBox.x2 = actorBox.x1 + child.x_expand ? availWidth : natWidth;
+        actorBox.x2 = actorBox.x1 + availWidth;
         actorBox.y1 = box.y1;
         actorBox.y2 = actorBox.y1 + availHeight;
 
@@ -314,11 +314,6 @@ const DashSlider = new Lang.Class({
 
         this._dash = dash;
 
-        // SlideLayout reads the actor's expand flags to decide
-        // whether to allocate the natural size to its child, or the whole
-        // available allocation
-        this._dash.actor.x_expand = true;
-
         this.actor.x_expand = true;
         this.actor.x_align = Clutter.ActorAlign.START;
         this.actor.y_expand = true;